Move local and remote project skills to use RepoMetadataModel by moirahuang · Pull Request #11559 · warpdotdev/warp

moirahuang · 2026-05-22T18:45:14Z

Description

Migrates local project skills away from ProjectSkillSubscriber in the normal indexed-repository path and instead discovers project skill files through RepoMetadataModel. Gitignored skills subtrees are deliberately added to RepoMetadataModel

If local repository metadata indexing fails (for example, when a repository is too large to index), the existing local project-skill watcher fallback remains available.

Testing

Added unit tests + locally tested

Screenshots / Videos

Regular skills
https://github.com/user-attachments/assets/ce2f6abf-ecf6-4f77-8848-313b41b0a3d7

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

Co-Authored-By: Oz oz-agent@warp.dev

oz-for-oss · 2026-05-22T18:45:28Z

@moirahuang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR moves project skill discovery from provider directories to concrete SKILL.md files returned by RepoMetadataModel, adding remote-path-aware discovery helpers while keeping local hydration in the watcher.

Concerns

Queued project directory handling now treats unrelated directory creations under a skill's owning repo/subtree as relevant to existing skills, which can re-emit already loaded skills whenever ordinary directories are created.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

moirahuang · 2026-05-22T22:11:59Z

/oz-review

oz-for-oss · 2026-05-22T22:12:12Z

@moirahuang

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR moves project skill discovery from the local project watcher/subscriber path onto RepoMetadataModel, adds file-based skill discovery helpers, and teaches repo metadata to eagerly load ignored skill provider paths.

Concerns

Remote project skill paths are discovered as LocalOrRemotePath::Remote but then filtered through to_local_path() before parsing, so remote repository updates still emit no project skills.
Removing the separate local project watcher also removes the code path that handled symlinked project skill directories, while repo metadata continues to skip directory symlinks.

Verdict

Found: 0 critical, 2 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

moirahuang · 2026-05-22T23:46:12Z

[2/5] Preserve skill location identity through API references #11861 : 2 dependent PRs (#11581 , #11862 )
[1/5] Support remote project skills #11459
Move local and remote project skills to use RepoMetadataModel #11559 👈 (View in Graphite)
master

This stack of pull requests is managed by Graphite. Learn more about stacking.

oz-for-oss · 2026-05-23T00:19:29Z

@moirahuang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR moves project skill discovery onto RepoMetadataModel, adds ignored-path interests so gitignored skill provider paths can be represented in repo metadata, and updates skill watcher/utils tests for local, ignored, remote-path, and symlinked project skill cases.

Concerns

No blocking correctness or security concerns found in the annotated diff.
Spec context: no approved or repository spec context was available for this PR.

Verdict

Found: 0 critical, 0 important, 0 suggestions

Approve

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

moirahuang · 2026-05-22T23:32:08Z

        }

        // Subscribe to home directory skills via DirectoryWatcher.
+        // TODO: Migrate home/global skill watching onto RepoMetadataModel as well.


calling this out because i'm not doing this as part of this PR but we'll eventually want to migrate global skills as well

moirahuang · 2026-05-27T00:01:25Z

            } else {
                RepoMetadataModel::new(ctx)
            };
+            model.register_ignored_path_interests(


hm this does have the side effect of gitignored skills directories showing up in the file tree which i think we don't want. working on a fix now

discussed this a bit with aloke. we're going to still directly register the gitignored skills subtrees. there shouldn't be significant performance concerns to doing this since skill directories are relatively contained in size + there shouldn't be changes in product behavior

oz-for-oss · 2026-05-27T22:56:40Z

@moirahuang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss

Overview

This PR moves project skill discovery onto RepoMetadataModel, registers skill provider paths as ignored-path interests, and keeps a local filesystem fallback for metadata failures. The main correctness path is covered by added tests, and I did not find security issues in the changed diff.

Concerns

The metadata-failure fallback scans and parses the repository synchronously on the model context, which can block the app exactly for the large repos this fallback is meant to support.
The same fallback scan skips symlinked skill directories during its initial pass, so existing symlink-backed project skills can remain unavailable until a later filesystem event occurs.

Verdict

Found: 0 critical, 2 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-Authored-By: Oz <oz-agent@warp.dev>

peicodes · 2026-05-28T17:43:01Z

        }
-
-        // Queue project directory creations for later processing since the file tree is not yet updated
-        self.queued_project_directory_creations


Is this no longer needed because repo metadata will fire events after the tree is updated?

yup exactly

peicodes

The approach LGTM. My general concerns with skill changes are:

Reading skills synchronously
Race conditions between reading skills and surfacing them in SkillManager

Neither seems to apply here so I think we're good?

Co-Authored-By: Oz <oz-agent@warp.dev>

cla-bot Bot added the cla-signed label May 22, 2026

moirahuang requested a review from kevinyang372 May 22, 2026 18:45

oz-for-oss Bot reviewed May 22, 2026

View reviewed changes

Comment thread app/src/ai/skills/file_watchers/skill_watcher.rs Outdated

oz-for-oss Bot reviewed May 22, 2026

View reviewed changes

Comment thread app/src/ai/skills/file_watchers/skill_watcher.rs

Comment thread app/src/ai/skills/file_watchers/skill_watcher.rs Outdated

moirahuang requested a review from peicodes May 22, 2026 22:44

moirahuang force-pushed the moira/skills-acquisition-repometadata branch from a484e3f to 077d252 Compare May 22, 2026 23:45

moirahuang mentioned this pull request May 22, 2026

[1/5] Support remote project skills #11459

Merged

4 tasks

This was referenced May 22, 2026

[4/5] Use remote-aware skill locations in UI consumers #11581

Merged

Support remote project rules through repo metadata standing results #11460

Merged

moirahuang requested a review from oz-agent May 23, 2026 00:19

oz-for-oss Bot reviewed May 23, 2026

View reviewed changes

moirahuang marked this pull request as draft May 23, 2026 02:01

moirahuang commented May 27, 2026

View reviewed changes

moirahuang marked this pull request as ready for review May 27, 2026 22:56

moirahuang and others added 2 commits May 27, 2026 15:59

Discover project skill files through repo metadata

e82ad99

Co-Authored-By: Oz <oz-agent@warp.dev>

remote ProjectSkillsSubscriber for local

109bb0b

oz-for-oss Bot reviewed May 27, 2026

View reviewed changes

Comment thread app/src/ai/skills/file_watchers/utils.rs Outdated

Comment thread app/src/ai/skills/file_watchers/skill_watcher.rs Outdated

moirahuang and others added 7 commits May 27, 2026 16:01

clippy

66d5f00

clippy

9102e9a

handle symlink

aa3d1fd

add fallback to local

326b92f

Keep base project skills discovery to tracked metadata

5281b7e

Co-Authored-By: Oz <oz-agent@warp.dev>

Restore ignored skill provider path interests

208b38c

Co-Authored-By: Oz <oz-agent@warp.dev>

Clarify local skill fallback directory scan

809eb44

Co-Authored-By: Oz <oz-agent@warp.dev>

moirahuang force-pushed the moira/skills-acquisition-repometadata branch from 565ce4b to 809eb44 Compare May 27, 2026 23:10

move to background, load symlinked skills

f109a6d

peicodes reviewed May 28, 2026

View reviewed changes

peicodes approved these changes May 28, 2026

View reviewed changes

guard against async metadata backed project skill changes

993dba0

moirahuang enabled auto-merge (squash) May 28, 2026 18:47

Fix Windows dead code lint in skill watcher tests

e2b4b15

Co-Authored-By: Oz <oz-agent@warp.dev>

moirahuang merged commit f6e6f78 into master May 28, 2026
26 checks passed

moirahuang deleted the moira/skills-acquisition-repometadata branch May 28, 2026 19:12

Conversation

moirahuang commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

Screenshots / Videos

Agent Mode

Uh oh!

oz-for-oss Bot commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

moirahuang commented May 22, 2026

Uh oh!

oz-for-oss Bot commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

Uh oh!

moirahuang commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot commented May 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

moirahuang May 22, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 27, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 27, 2026

Choose a reason for hiding this comment

Uh oh!

oz-for-oss Bot commented May 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

Uh oh!

peicodes May 28, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 28, 2026

Choose a reason for hiding this comment

Uh oh!

peicodes left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

moirahuang commented May 22, 2026 •

edited

Loading

oz-for-oss Bot commented May 22, 2026 •

edited

Loading

oz-for-oss Bot commented May 22, 2026 •

edited

Loading

moirahuang commented May 22, 2026 •

edited

Loading

oz-for-oss Bot commented May 23, 2026 •

edited

Loading

oz-for-oss Bot commented May 27, 2026 •

edited

Loading